tree d91f6839150bac52ff51dca1cca5f0914422323c
parent 02840dc19cf49bb4fa1e7234bcdb0f573c3c37e1
parent cebf374296c6258e1bb4df31b0b0629752b84324
author The Android Open Source Project <initial-contribution@android.com> 1337875275 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337875275 -0700

Reconcile with jb-release

Change-Id: Id6125c430848f989d6ce0494403114c137a1dfa3