OSDN Git Service

Merge "resolved conflicts for merge of dce94165 to klp-dev-plus-aosp" into klp-dev...
authorElliott Hughes <enh@google.com>
Fri, 9 Aug 2013 01:05:48 +0000 (01:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 9 Aug 2013 01:05:49 +0000 (01:05 +0000)
commit598f3e9c4a48a4f4cbae6fb163f378d9fd1e6321
tree032a162a2248b2fc0be232afc9b9666747a1e5dd
parent14ec1b58869362f07ffdf7495cbba2f746da7b77
parent3c3a64616a7d37183ac008516afad4dd93b9f562
Merge "resolved conflicts for merge of dce94165 to klp-dev-plus-aosp" into klp-dev-plus-aosp