merge in lmp-release history after reset to 1f55fe07ec11103d5da23ca83f7bad72d5cdd76a
authorThe Android Automerger <android-build@google.com>
Sun, 17 Aug 2014 14:18:39 +0000 (07:18 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 17 Aug 2014 14:18:39 +0000 (07:18 -0700)
commit5613484384b73d01b5b3acfaf94d8699e9ef4fa7
tree599156bc0b1e97a5afffac1374e8fe3bd894636f
parent1f55fe07ec11103d5da23ca83f7bad72d5cdd76a
parent5c6810678f6d6066af0a028a59491c69bf041d6c
merge in lmp-release history after reset to 1f55fe07ec11103d5da23ca83f7bad72d5cdd76a