| commit | 9486780029868bc04e2bd2f2c2ed34283fa2d25d | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Tue Jul 28 19:38:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 28 19:38:17 2015 +0000 |
| tree | fe9ed94353b09dda232fceb64691f96dcd5db8d3 | |
| parent | 0c0d54637af7109ae22e21a117dba3efdaded4b5 [diff] | |
| parent | 680c92febe88260b74f101838a9734b8e10a704c [diff] |
am 680c92fe: resolved conflicts for merge of 13ef17a3 to cw-e-dev b/22609402 Change-Id: I3753db1f922923a6b462fa75a5c0d826e0413f95 * commit '680c92febe88260b74f101838a9734b8e10a704c':