tree cd2c01aa3e0fc95e42c15c8f665ef83db3abd71a
parent 77e93514b350cdeb5624d5e4588ea0f449cc92af
parent 74b5c490793cccdc5652c659dee02ab1360d0bf7
author The Android Open Source Project <initial-contribution@android.com> 1346101867 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1346101867 -0700

Reconcile with jb-mr0-release - do not merge

Change-Id: Iefb0fa4bd43eaa8fef120035ae0f81f0b001dad6