merge in lmp-release history after reset to b30d3481987401d1f3ede9317b0d6f80ebbd0e57
authorThe Android Automerger <android-build@google.com>
Tue, 30 Sep 2014 13:18:32 +0000 (06:18 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 30 Sep 2014 13:18:32 +0000 (06:18 -0700)
commitc587b37bd3fb022e73eebaa22fe85544d4c545e0
tree07cef374cf7a311c66d29d51aaf5634bc81a8c38
parentb30d3481987401d1f3ede9317b0d6f80ebbd0e57
parent549a95627b6ff1cb2ecb615714deea9e8ab3e994
merge in lmp-release history after reset to b30d3481987401d1f3ede9317b0d6f80ebbd0e57