| commit | c582fde93ded7219107157333a9e46d780adcf9c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 08 13:36:08 2013 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 08 13:36:08 2013 -0700 |
| tree | f160b266ecfa9eef394f1ba7755f9e5bac422fd0 | |
| parent | 5de9ef20d596bc20f53cba664f1ac7e358910ea2 [diff] | |
| parent | c158971f13ea4f496dc7836c698f1220fa4e4bba [diff] |
resolved conflicts for merge of c158971f to stage-aosp-master Change-Id: I3d77b86f7e616af62a826fc37126706ad8ff6158