tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 5e9680e976ea61a0d2e957c1f91e6a8a417e89d5
parent bb0086ae73549164cf9842d37ea082374dcee3b4
author Qiwen Zhao <zhao@google.com> 1382467587 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382467587 -0700

am bb0086ae: am 45d8f947: snap it from jb-ub-now-indigo-rose at 4d3f022c9a7170dd4b069ee71534f1baf30cb2f4

* commit 'bb0086ae73549164cf9842d37ea082374dcee3b4':