tree 5ce28fa7e34a1246c474184705413c1686cb3ca5
parent 6535723967c6dd7ce42669cd8815da82faab911a
parent 25f0d7ba1987de61c75f8c68b19de48e0ad9736c
author The Android Open Source Project <initial-contribution@android.com> 1343746291 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1343746292 -0700

Sync with jb-mr1-dev

Change-Id: I5bd4d44e0e33d28487c04a27652469697478ecd4