tree 94d6b17b7df696eb9e394e778bca44c9354c84ba
parent dee6975aaab2eeea21aa02bb4fc7f844e016048c
parent 88cf19181afeb76c5c1444703ee402bf827238d9
author The Android Open Source Project <initial-contribution@android.com> 1369839974 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1369839974 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Ib54cc659fb7a4fc18df8f98b1c12547d46e23e8e