OSDN Git Service

Merge "resolved conflicts for merge of 261e7a37 to master"
authorAlex Klyubin <klyubin@google.com>
Thu, 2 Apr 2015 01:24:53 +0000 (01:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 2 Apr 2015 01:24:54 +0000 (01:24 +0000)
commit6c3d3db3b4644aee68a6ac9e80dfe21ee62ac597
tree7ceb46d0512a5f49c4b78d876d339913d3a99eb4
parent56a33230b7bde40ac97a8625fb5eb2c67ccb5268
parent305ebe207a174c9f46146ad73572a601b8a28787
Merge "resolved conflicts for merge of 261e7a37 to master"