| commit | a8ac52d6c4a7813d06c2618a6a2a48d4c703bf61 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Apr 16 18:19:48 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 16 18:19:49 2015 +0000 |
| tree | 5adc9c2584f4c89b8aa6a848e64bc5addb1d8a80 | |
| parent | f99c656afbadd87122389a3cf00abee698efb9a9 [diff] | |
| parent | 4967201a2c524906b90739c9a549174fb1175a24 [diff] |
Merge "resolved conflicts for merge of 186fe7b1 to master"