tree 78096c41d1d3df1f619f69c6d1461911026f2d5d
parent d3ac513367a88f850812e5dbce9e1ff9760c8a48
parent 36aa2bb0089cd944e8d8cf683cc6789c4ef14f0d
author The Android Open Source Project <initial-contribution@android.com> 1339080660 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1339080660 -0700

Reconcile with jb-release

Change-Id: I7c67988057574cdae1eedc5f68ca3f6c758afbf2