tree 9995a90a882eb46b387ee1b6c46eb82c6209f1f2
parent 83e60e42573ebc1bb06a408170bcdac2824e8dd6
parent 69412a51f58fa9450f1cb077c8d4b6410128d993
author Naveen Leekha <leekha@google.com> 1443137741 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443137741 +0000

am 69412a51: am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev

* commit '69412a51f58fa9450f1cb077c8d4b6410128d993':
  resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev