tree 21964982a5bd5a099fe687e2521eaaf895064bc2
parent 8c22e39376761a33ddf9a378a8f5006750abad1d
parent c0cbaac70bd277584f36c82a1f62ef8412242561
author The Android Open Source Project <initial-contribution@android.com> 1340115358 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1340115358 -0700

Reconcile with jb-release

Change-Id: Ib37076b8d9145fe8a0312b3111c60cf9b0431598