merge in lmp-mr1-release history after reset to 8a6bf4bced8a37c671411e0f6dfa997c479a5153
authorThe Android Automerger <android-build@google.com>
Mon, 20 Oct 2014 13:10:39 +0000 (06:10 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 20 Oct 2014 13:10:39 +0000 (06:10 -0700)
commit3038f9d3f16c5185fee2a33c6582147595a7077f
tree8fd077e2cbf91b6ecc4a051183cf941c13cda0af
parent8a6bf4bced8a37c671411e0f6dfa997c479a5153
parent8a5ada5a6235eee0ad82734b09f00a5a76b9e591
merge in lmp-mr1-release history after reset to 8a6bf4bced8a37c671411e0f6dfa997c479a5153