tree 78add81f4b8235ed0a320ed66a8df1531c9b8373
parent c2a6cae574b71b4b42c8bbbde17ea8796121f0de
parent f109fc89bac670b2ea094a7e2f2e8e6ee895b3b1
author The Android Open Source Project <initial-contribution@android.com> 1370540232 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1370540232 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I7b13f5e954578c6cbafa6acd1510c1d0f257661e