tree 10da860fcff71886af91d082e31f0e1917926848
parent ade342d96af7f2699084b938025beb3320ec13ec
parent 9a58fb53f323ec19d558e63ffe8483619718c57e
author Qiwen Zhao <zhao@google.com> 1414566068 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566068 +0000

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

* commit '9a58fb53f323ec19d558e63ffe8483619718c57e':