tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent d53e22d28dea0fef7a4011fd34d07772724268b6
parent 45d8f94731ba8c55e1a9162c4168e7e3b02883de
author Qiwen Zhao <zhao@google.com> 1382467390 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382467390 -0700

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

* commit '45d8f94731ba8c55e1a9162c4168e7e3b02883de':