tree 69f84e6e9df514dbef2e6c9d911b742f21e83218
parent 49faae4ce563e8c54d2e18398861e1aa2e0b41aa
parent 6fbbb9ca4fe6eef41a2485bda29a40e8fc455c81
author The Android Open Source Project <initial-contribution@android.com> 1351700150 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1351700150 -0700

Reconcile with jb-mr1-factory-release - do not merge

Change-Id: I9601fda00ccff581fcf0eb9dfe47c1bf87e5bda0