tree 5e41884d073d6f7d6495a42b014da6e278e3ca7a
parent 52edd90145262c80734d76408e4beb9b9500f5f5
parent 37c652c518349acbb900d0a222b85ac2315eb9c0
author The Android Open Source Project <initial-contribution@android.com> 1341019700 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1341019700 -0700

Reconcile with jb-release

Change-Id: I55c12bbde76d8d105fafa27ff524bf35592465dc