merge in lmp-release history after reset to 48a3723b5dea5257aab2fffd542d23dcc8a0ffbb
authorThe Android Automerger <android-build@google.com>
Wed, 8 Oct 2014 13:16:29 +0000 (06:16 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 8 Oct 2014 13:16:29 +0000 (06:16 -0700)
commitfb78bc5dc2129d027ab42096fdd92c031d21e35c
tree35d675b795241dd302441bad48409d7fd39273f7
parent48a3723b5dea5257aab2fffd542d23dcc8a0ffbb
parent1b54543e1e33f742febfa6c60418fed56250d05d
merge in lmp-release history after reset to 48a3723b5dea5257aab2fffd542d23dcc8a0ffbb