tree d5fd1abe0c2f9490c5f7f9b7fc16b394e9718dcb
parent f87d9c86982f8873b7f449029d702ba33569e629
parent 7452db98905de30cb3205358f2d19440e91d40c3
author The Android Open Source Project <initial-contribution@android.com> 1339431774 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1339431774 -0700

Reconcile with jb-release

Change-Id: Ic8df0fdb3f0a3e9eb54bbd37a929b04c394beb28