| commit | 0f055d11096cb02563e9c040cd03c791fd8f69a3 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri Jul 26 12:46:02 2013 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Fri Jul 26 12:47:51 2013 -0700 |
| tree | 8c7e730f17174ab4e11786fde1c2a05c7039d507 | |
| parent | 93c3396f8b33539489763ebdfafcedb4127009d9 [diff] | |
| parent | 7934ac288acfb2552bb0b06ec1f61e5820d924a4 [diff] |
resolved conflicts for merge of 7934ac28 to dalvik-dev Change-Id: I8798a6f154463d3f92f6aca62f14130aec82d273