| commit | ba32c249addded770c288771748aa25d554352a0 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Thu Jul 18 20:52:47 2013 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Thu Jul 18 20:52:47 2013 -0700 |
| tree | 1b3b73575014964b462f1070b3d801f4a74ecf66 | |
| parent | f6d197a75930cfba096c4983c4f27a10158536fa [diff] | |
| parent | 4d9f670bdbabc44c5be76b8015e795f4efe2286f [diff] |
resolved conflicts for merge of 4d9f670b to stage-aosp-master Change-Id: Ia5bb368dbbd857c6e201b821ae7c03a9f6f5006b