tree e89d89e8e9439ccbec80fc1817ef7f7b3d6a73ac
parent 9b454727f60acf3a50059394662982933eac3373
parent 436080705c1ee0e88e93e969774ad15f3c83e8d4
author Unsuk Jung <unsuk@google.com> 1442860738 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442860738 +0000

am 43608070: am 2aaeb74e: am bb75771e: resolved conflicts for 50d071ae to lmp-mr1-dev

* commit '436080705c1ee0e88e93e969774ad15f3c83e8d4':