tree 25613177ba62ffd8318b52c0923622168fd288c1
parent 526a09b39f2c4d80731bdb8352f00dd022fee3ad
parent e04112a20ce1f3e0b208427c93aed8624f8dd229
author The Android Open Source Project <initial-contribution@android.com> 1365032619 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1365032619 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Icf2700c6f34ca44ac74b72334809e3e5d3f14917