OSDN Git Service

Merge "resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp" into lmp-dev...
authorAndreas Gampe <agampe@google.com>
Thu, 4 Sep 2014 23:17:11 +0000 (23:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 4 Sep 2014 23:17:12 +0000 (23:17 +0000)
commit79de4de3a422adda305bb09a38030efbdf187a43
tree11ecc935a25627ec55aeeead67f6190f16736ec4
parentf0614ae955e855d93b443ba8b17a636dcb9b9f8b
parentdc84c6ca86290393fec2bb730f125575ee9e168e
Merge "resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp