merge in lmp-release history after reset to 45b5f3131eb0fab88ab77e64aa7294742aab3478
authorThe Android Automerger <android-build@google.com>
Thu, 21 Aug 2014 13:12:21 +0000 (06:12 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 21 Aug 2014 13:12:21 +0000 (06:12 -0700)
commitf19afcfb74b5ff1c505ef6562e9c3d65fd1c6200
tree4c80a051de77573a08548d321d671fc502564c34
parent45b5f3131eb0fab88ab77e64aa7294742aab3478
parent32849a4336f1a5e8761cd2396c022abf80aabc30
merge in lmp-release history after reset to 45b5f3131eb0fab88ab77e64aa7294742aab3478