tree cba62d0d64153aa2169651696bc238591341d679
parent 1d56243748aec4c854bd79d5963b2217d14d591e
parent 42de0037776d933455f27a461abd29ce39a2e77d
author Qiwen Zhao <zhao@google.com> 1414085119 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085119 +0000

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

* commit '42de0037776d933455f27a461abd29ce39a2e77d':