tree 433cf7805fb88d73eb9085ce62266f3611c1c6f2
parent ca6ee0a324da6ceb8b62ec14500557c3fa494909
parent f45a17f26b034e4fbde71166678cfd7c6f871723
author The Android Open Source Project <initial-contribution@android.com> 1340111634 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1340111634 -0700

Reconcile with jb-release

Change-Id: I92864df53af5b49c90255cbf07c095bbeb7be0a1