tree 44352fbb103d2af34be99af29b258e92671b40d3
parent f4b1756f88c34efefb33b4103230ee334d9c9262
parent 485a1841b281b83e35229b1bb385986d43608aa1
author The Android Open Source Project <initial-contribution@android.com> 1349214476 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349214476 -0700

Reconcile with jb-mr0-release - do not merge

Change-Id: I22a716496e377e047ccf9d19cd30833225707565