| commit | b4b1000e4711b6375a898503a7ad5d98f5330aab | [log] [tgz] |
|---|---|---|
| author | Daniel Estrada Alva <destradaa@google.com> | Thu Sep 03 17:25:51 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 03 17:25:51 2015 +0000 |
| tree | 1683822d7dd6d5ead7dd65d3a8b522867b6d291f | |
| parent | e2796c216e82091f8ee54c9c438b2119a069e029 [diff] | |
| parent | c6454fcb70192bdac845ed0a848d4cef18324cb7 [diff] |
Merge "resolved conflicts for merge of 256718bc to master"