merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Sun, 9 Nov 2014 16:05:02 +0000 (08:05 -0800)
committerThe Android Automerger <android-build@google.com>
Sun, 9 Nov 2014 16:05:02 +0000 (08:05 -0800)
commitc3acadc48258b1ea5131a2a14bdce8b20adf2968
tree91be5c97f76d5835b9c2baf7b3f26267fb52293c
parent3ea16cf73e8f6b00c8cda500b2432581fa700111
parentf37b425d5ead7995cff9dbebb6f30ab24e9bad6e
merge in lmp-mr1-release history after reset to lmp-mr1-dev