merge in lmp-mr1-release history after reset to 172568141a72345cc9e7599930332d4200989931
authorThe Android Automerger <android-build@google.com>
Sat, 8 Nov 2014 14:12:57 +0000 (06:12 -0800)
committerThe Android Automerger <android-build@google.com>
Sat, 8 Nov 2014 14:12:57 +0000 (06:12 -0800)
commit4178f3ff802ee28ce41252c5212f13a4cf770da7
tree93cdb47ebac157d52799d5f46e2e1158bc1c52e1
parent172568141a72345cc9e7599930332d4200989931
parent3ea16cf73e8f6b00c8cda500b2432581fa700111
merge in lmp-mr1-release history after reset to 172568141a72345cc9e7599930332d4200989931