| commit | a5e1285a6d5ef8e6602f39cf33277cde2f6bccbf | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Wed Nov 05 10:50:13 2014 -0800 |
| committer | Ian Rogers <irogers@google.com> | Wed Nov 05 10:50:13 2014 -0800 |
| tree | dffcb3954ff6ea3c9036033eec01fac0ba0e6865 | |
| parent | 2d3e650f8ef1aed488f870aa3d1028775e353490 [diff] | |
| parent | f9a3c05f9ed2a8e0b4257f9fd1695cef2a6124b9 [diff] |
resolved conflicts for merge of f9a3c05f to stage-aosp-master Change-Id: Id4220cfc2f845d04b32404171cde1fd144fe1585