| commit | 0c0d54637af7109ae22e21a117dba3efdaded4b5 | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Thu Jul 23 21:24:37 2015 -0700 |
| committer | Hyunyoung Song <hyunyoungs@google.com> | Thu Jul 23 21:24:37 2015 -0700 |
| tree | fe9ed94353b09dda232fceb64691f96dcd5db8d3 | |
| parent | cf51139c6e1d57b57177109f2177edc41edf5bbc [diff] | |
| parent | 13ef17a37e683b8ad5800e9f542b411180fbec2f [diff] |
resolved conflicts for merge of 13ef17a3 to mnc-ub-dev b/22609402 Change-Id: I80699d985088b9b79211284e710e8a6b8b90860b