tree 60933b8f0b1e66b929e9b7000c91c49ef8b0b069
parent 801a079269d78e29c105462518dd4876dd031b2e
parent acb046abd043a10d8478c31f020ea8c33e909e93
author The Android Open Source Project <initial-contribution@android.com> 1355326722 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1355326722 -0800

Reconcile with jb-mr1-release - do not merge

Change-Id: I8c4ba6b279cebcc46d7b7cb71c81f1de96962ca9