| commit | 889814cee0ebcf70069d04d3ae77c97c09efb5a1 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Mon May 19 22:42:58 2014 -0700 |
| committer | Michael Wright <michaelwr@google.com> | Mon May 19 22:42:58 2014 -0700 |
| tree | 5096380a92e2db4a6fa5500c0619632eb597e488 | |
| parent | 00fabcbeb035fb513293ea01d245002f40b3234f [diff] | |
| parent | 32912e0a7308d2e0327b3273763f0b13fd0099c0 [diff] |
resolved conflicts for merge of 32912e0a to stage-aosp-master Change-Id: I140e2024bd0e6e81ab550718103d45220d8bde26