| commit | 044a9b97b01a934e6cd9ef2f2914d401c4fa145b | [log] [tgz] |
|---|---|---|
| author | Jake Hamby <jhamby@google.com> | Wed Aug 29 18:09:29 2012 -0700 |
| committer | Jake Hamby <jhamby@google.com> | Wed Aug 29 18:09:29 2012 -0700 |
| tree | 21450aa0e67015ebc06fc7f9dc51d85f1c5012e5 | |
| parent | 4a4edbbfce2e1a8b34b5b9ff2793eace303dae5a [diff] | |
| parent | b35e4d778a95d89c9c9317de0f93f51faab5bbac [diff] |
resolved conflicts for merge of b35e4d77 to jb-dev-plus-aosp Change-Id: Idec590dbd9e051a3faeded1af9eb4a78216f0496