| commit | dff4ec87e7b942b7b4410f639fc74c2cffb386d6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jul 09 15:28:51 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 09 15:28:51 2013 -0700 |
| tree | 0170831ebee5c0b5fba1f6ddfce0d0cd8f1d5a13 | |
| parent | 4d380d71e06781314b052ea71ef20ed6511e560f [diff] | |
| parent | e16a21c6b4f108813e5f5e00f30e0ff075de504c [diff] |
am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master * commit 'e16a21c6b4f108813e5f5e00f30e0ff075de504c': Track libcore API change.