tree ae2ff6dec5ff0e1f33cc2c13c0176a0b58b05936
parent 59a8f11d636e07e500e7efe30a05ad4344c59a95
parent 23e8dd9bfc7f516a24fad22a71cf1655e4c62d0a
author The Android Open Source Project <initial-contribution@android.com> 1340403616 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1340403616 -0700

Reconcile with jb-release

Change-Id: I55842c8ce980d1a5ea7bb4dcb3eb7d8dd4c9dbac