tree e2c6ad745aad19e57596dd9aa997c26b302a1bb6
parent 487241fdd71c098695dba07534316d015de08734
parent 262635a1a417326a4db253e0f06b9056670a8d33
author The Android Open Source Project <initial-contribution@android.com> 1340982854 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1340982854 -0700

Reconcile with jb-release

Change-Id: Id4de428001ead0dc7fd1cc38a594b2704e1879af