| commit | bd555f1523ec3faafe1e3c6cefce9fe0c96090c1 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Aug 04 13:36:07 2015 -0700 |
| committer | Ying Wang <wangying@google.com> | Tue Aug 04 13:36:07 2015 -0700 |
| tree | 09d16e3dfce6d31fe3146d93c8d4112a0b649ecc | |
| parent | 5c78a488d0b7d293c254493a9fc5fc71bc50b011 [diff] | |
| parent | d86f39cab79e11696ff23c836df73c421fd401e2 [diff] |
resolved conflicts for merge of d86f39ca to stage-aosp-master Change-Id: Ifceb6705eeaaacc9f49788bc0e37a27e398beef0