tree d0c142e7996c22f0fe450562ccde368e94ae2014
parent 526abb0665aa6dbde9fc0689a88d90e01eba74cd
parent aef25b7d9c43b0e546312c819066b0684711ef7f
author The Android Open Source Project <initial-contribution@android.com> 1346943321 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1346943321 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Ibb666e518d3d41ce85b3276a702a28d191cdba92