tree 7102f0993e90834984c91e0d5beddc7f7a01f4ac
parent 6ebf0aa4df1a2484f52a894384286a084ac0a129
parent 9f99e382ef161dda2ff137ea8be80f26f150399e
author The Android Open Source Project <initial-contribution@android.com> 1349194727 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349194727 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Ie754a300e8665e6dfd25260714851d7bbe99261f