tree 9ee25dddeaf5c13c830bf7e5b6b96e3e93441557
parent cfb9c213d7bbcddae215f85343385adb9631a15d
parent 58019b12e5e9d34da5fa778aacbaebf133672bc7
author The Android Open Source Project <initial-contribution@android.com> 1345904272 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1345904272 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Idf52e01ae31e4f8665ff945fc53943906611e62e