tree 130a48dc5c90c2bb9c780080e763570e316be8a0
parent 23282720dd7972dfc528c9d55aac069acca91082
parent 7281b79c7fc526dc0afac7f463560eb23e0c3328
author The Android Open Source Project <initial-contribution@android.com> 1345904236 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1345904236 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I7e42d7117f567e0dc45c8c1f4a3dc73a8704de19