tree 8b2c2b135bab9ef84ee4377434f6c686976dc87c
parent 72bad18661682f838c156038fdb6879160c83fdb
parent 7e4712c96ff60391892425ee50b02170aac3c3d0
author The Android Open Source Project <initial-contribution@android.com> 1338309893 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338309893 -0700

am 7e4712c9: Reconcile with jb-release

* commit '7e4712c96ff60391892425ee50b02170aac3c3d0':