OSDN Git Service

Merge "resolved conflicts for merge of d11eac34 to lmp-dev-plus-aosp" into lmp-dev...
authorChristopher Ferris <cferris@google.com>
Mon, 6 Oct 2014 23:32:52 +0000 (23:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 6 Oct 2014 23:32:53 +0000 (23:32 +0000)
commit9a7d31eb9c20b63ed4747a10c1f68e464d3c0914
treea81290c1010ff02fb59130995b83aa0515b4170b
parent2d04b5e09f08089df16f9d2603698470ff34add8
parentd61d2b7b8037ba3f7eb97af545daaa3e267c2638
Merge "resolved conflicts for merge of d11eac34 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp