tree 890595946c44ff05f572c282bd732368ac39e970
parent e57772e0d4fb47a073271f00a1f0c7f1d99c1d39
parent 8970fe287e798d543c0ac9aff2e076ba6ba4746e
author The Android Open Source Project <initial-contribution@android.com> 1365613567 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1365613567 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I03c3bb1f4a08904ebc079b90aa6eec4f61e7dbaa