| commit | e5ea4bf378ca07b07769e9912a4f0ebbe4f65d8f | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Apr 15 11:19:31 2013 -0700 |
| committer | Kenny Root <kroot@google.com> | Mon Apr 15 11:19:31 2013 -0700 |
| tree | d090678369d0a89b9edf29f1313d3fc6b2859ddc | |
| parent | feb5a72843ffa6df0140a8c1cfa9c42f6612e19f [diff] | |
| parent | caf0496dc28445c1eb8288e38b44a9809779511b [diff] |
resolved conflicts for merge of caf0496d to jb-mr2-dev-plus-aosp Change-Id: I006f9a5a6b71ab618f88c2ecb848e270128e20a0