OSDN Git Service

resolve merge conflicts of 69ed5d9 to stage-aosp-master
authorDan Willemsen <dwillemsen@google.com>
Wed, 13 Jul 2016 18:28:47 +0000 (11:28 -0700)
committerDan Willemsen <dwillemsen@google.com>
Wed, 13 Jul 2016 18:28:47 +0000 (11:28 -0700)
commitd269bf4328b608d43b357adbbe3b25d7136883bf
treee2613723b9dbf0062d0d133e828deee6decdad4c
parent5aeef066b13f2f975550b5964cc065f2be43aa73
parent69ed5d9a8306ee0427f378abe85cabfc5c3c1f17
resolve merge conflicts of 69ed5d9 to stage-aosp-master

Change-Id: I1e86670dcf4e3187efca4beff673bbc057cbd509
modules/Android.mk