| commit | 6c3d3db3b4644aee68a6ac9e80dfe21ee62ac597 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Apr 02 01:24:53 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 02 01:24:54 2015 +0000 |
| tree | 7ceb46d0512a5f49c4b78d876d339913d3a99eb4 | |
| parent | 56a33230b7bde40ac97a8625fb5eb2c67ccb5268 [diff] | |
| parent | 305ebe207a174c9f46146ad73572a601b8a28787 [diff] |
Merge "resolved conflicts for merge of 261e7a37 to master"