tree 36a1b73079c6fe2d891d9b3fc0618f129ff71441
parent ad7c32bf2cdc135b827d60f5ce7a77b50b576395
parent 4b06007c27e26fcc5b8ec8136defde7eb3ecd6cb
author The Android Open Source Project <initial-contribution@android.com> 1340651904 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1340651904 -0700

Reconcile with jb-release

Change-Id: I2b5cf5780851a3979016a50ff39f7da6d6d1a82b