tree ecfa5a7862fa2f0e9ea928f3b1aeaec388dc10e0
parent 3ca90d33f83ba529349a4c1e577879af8220a33a
parent 7b94da7da1601a480b1af24f2243d502ffb16eb0
author The Android Open Source Project <initial-contribution@android.com> 1340378240 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1340378240 -0700

Reconcile with jb-release

Change-Id: I20961dda95f0a5b0b580b73de5e8b09434eaaa44