| commit | 359d58dc0f54d1ca0ee8789b4b7611bbb50bbda5 | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Mon Nov 03 09:27:47 2014 -0800 |
| committer | Dmitriy Ivanov <dimitry@google.com> | Mon Nov 03 09:27:47 2014 -0800 |
| tree | 3f6ac361eb39d3f4135547593aab55cf04846aa4 | |
| parent | 24dfaac494de3a31e1cd106becc2b2ad38e13bbe [diff] | |
| parent | cb8c583d493a98cd1499c64e7c68f3ac37ebb7cd [diff] |
resolved conflicts for merge of cb8c583d to stage-aosp-master Change-Id: I3a75fda571896ad42e5a2b9499e156e9449d23ed