OSDN Git Service

Merge "resolved conflicts for merge of 852fc3e6 to lmp-dev-plus-aosp" into lmp-dev...
authorDan Albert <danalbert@google.com>
Wed, 15 Oct 2014 00:19:06 +0000 (00:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 15 Oct 2014 00:19:06 +0000 (00:19 +0000)
commitb0d324aadd90abc3b91c97af418c3d27af364925
treee128fd40cc8bf099b60d79a5463303f76e36df27
parent3e65583ef7a998a34dcc880df9c13cd33ac7720a
parentae66eba6f3e6996e57c8aa185d9a57e4684d43e2
Merge "resolved conflicts for merge of 852fc3e6 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp