tree 25613177ba62ffd8318b52c0923622168fd288c1
parent c7322c3146ab96bbc43aac8c5be271e8f97b5124
parent e05e6f277c00b31341d199ce5f5f705b75c9cac6
author The Android Open Source Project <initial-contribution@android.com> 1364917185 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1364917185 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Ica8969ad3d63f92950481e984bfafc2b978cfda2