OSDN Git Service

resolved conflicts for merge of c8cf3513 to lmp-dev-plus-aosp
authorHans Boehm <hboehm@google.com>
Tue, 2 Sep 2014 22:24:33 +0000 (15:24 -0700)
committerHans Boehm <hboehm@google.com>
Tue, 2 Sep 2014 22:24:33 +0000 (15:24 -0700)
commite8d77291670ad435491a08f6c3d83881063e2e12
tree9587c94b02f525e042ff446f900403afea795c7c
parent6c69675423f3375ba4d9dadfaf9502a15576158c
parentc8cf3513ecb265ba3aadc846aa2113290a504c44
resolved conflicts for merge of c8cf3513 to lmp-dev-plus-aosp

Change-Id: If1181e3496d0309eebbaa1f1d2696269e61c64bc