| commit | 541e0d6d1ca26bb51c87b33921a2baf73c8d7f33 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Apr 15 12:26:49 2013 -0700 |
| committer | Kenny Root <kroot@google.com> | Mon Apr 15 12:26:49 2013 -0700 |
| tree | d090678369d0a89b9edf29f1313d3fc6b2859ddc | |
| parent | df8cbfa5e26df48052ee7aafb548af290f818ef7 [diff] | |
| parent | 6fb172b12eefeea4b565c616a4d0a8d1fb015217 [diff] |
resolved conflicts for merge of 6fb172b1 to jb-mr2-dev-plus-aosp Change-Id: I49dcec1d43e7b8dbbb9b89e2454ec5d657e53e02