| commit | 8d972a6f7975f3b43a1551eb5619f008561a5029 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Oct 03 11:44:20 2013 -0700 |
| committer | Stephen Hines <srhines@google.com> | Thu Oct 03 11:44:20 2013 -0700 |
| tree | 90d5468b5879fef7d77b8a56ee6915fa9260f0fb | |
| parent | 77e2f0f3756897029811726095c0be16e2a4f397 [diff] | |
| parent | 4293770c4700c898f252fbba14aa5f1c33380b41 [diff] |
resolved conflicts for merge of 4293770c to stage-aosp-master