tree 5ce28fa7e34a1246c474184705413c1686cb3ca5
parent ddeeaec2dd2ff5cf10bc3f87f22401bfcbd0fd48
parent ba352c87633138aae401f4cd142372097e700b0f
author The Android Open Source Project <initial-contribution@android.com> 1343772187 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1343772187 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I2c45a6566f7eff107fa320d407fce712616e6801