tree 2be84a6f3cd7ee7e09759e2393a1b219475e4560
parent 1bf455af2f26ae78e4b41167276bde0af6b20c89
parent bb483c39b6a978e8f9802d4204c51a5be0035826
author The Android Open Source Project <initial-contribution@android.com> 1347460917 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1347460917 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I3935a689501afea5ad92ff559aa433b03d78bd65