OSDN Git Service

resolved conflicts for merge of 9483748a to stage-aosp-master
authorCasey Dahlin <sadmac@google.com>
Wed, 2 Sep 2015 21:33:41 +0000 (14:33 -0700)
committerCasey Dahlin <sadmac@google.com>
Wed, 2 Sep 2015 21:33:41 +0000 (14:33 -0700)
commitb15623cf1c63d33fdd60c6046312c88cda961eb6
tree8559b7fa9de6f54f413a52348b0614f0513d2964
parentbad130eed378891b82250d90aaf207088b4362e2
parent9483748aea526f1694e1054b9a2d0d9c9903735b
resolved conflicts for merge of 9483748a to stage-aosp-master

Change-Id: I82fd3a6ddeffc564915e43b23b81293adf1f9b5d