OSDN Git Service

Merge commit 'ca6d7dcbd49356338eaaa88de87885ecaf218c4d' into master. am: 665bcf8f2d
authorStephen Li <stephenli@google.com>
Fri, 27 Jan 2017 07:37:43 +0000 (07:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 Jan 2017 07:37:43 +0000 (07:37 +0000)
commita5ec60c8eaf118ac186198a6c9cf3d30f27d04dc
tree8d271395e41a48c7983946ad6a9c20bf9e9a9345
parentc236b9d2d9869d3cadb9511def27da71158705d2
parentc28c4325d207ee4ce1344fb56abe7630a94af440
Merge commit 'ca6d7dcbd49356338eaaa88de87885ecaf218c4d' into  am: 665bcf8f2d
am: c28c4325d2

Change-Id: Ib4b641b82598b01ce6f6706929b4e95a120ad359