OSDN Git Service

Merge "resolve merge conflicts of 04c7dc2 to master"
authorRobin Lee <rgl@google.com>
Thu, 21 Apr 2016 20:16:06 +0000 (20:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Apr 2016 20:16:06 +0000 (20:16 +0000)
commit02ba0a13a38c7a4edf91d58bcbe0c6f7b062cff4
tree287fdafecf301486884017f0b1ee8d143b34f2a4
parent18b6b047726abad7f16713f43cd2ac451798779b
parent99301e06fac91d59b81cfc119f9d8f987cbd087b
Merge "resolve merge conflicts of 04c7dc2 to master"