merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Thu, 20 Nov 2014 14:11:58 +0000 (06:11 -0800)
committerThe Android Automerger <android-build@google.com>
Thu, 20 Nov 2014 14:11:58 +0000 (06:11 -0800)
commitefc802925a86aa23259eb04ebb84d1f767d267c5
treed502dd687ba52ad9f0326fef87c7c9771ce977cf
parent652ee0ef914be165355b34c903c4cbc95d4f4afc
parent2fe536f9bad802fe6fcbe16d7b33bdac37b2f345
merge in lmp-mr1-release history after reset to lmp-mr1-dev