| commit | 9bf627422c33102b4a06eebf5d1884490faae8c7 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Sep 01 09:31:56 2015 -0700 |
| committer | Ying Wang <wangying@google.com> | Tue Sep 01 09:31:56 2015 -0700 |
| tree | 4f59e91d22a8cda294c8551508f7552b24588ea6 | |
| parent | f04f391b5f036563f71aa0c1805dc86c09137e98 [diff] | |
| parent | a15ae2160a044e57c65f44a310c442dd470a2b96 [diff] |
resolved conflicts for merge of a15ae216 to stage-aosp-master Change-Id: I9c10cf2d10f4295d12edd490ff0f9482c1810bf8