| commit | c3a6e4d8fa61ac5e7b95322b6d8bdf7292b664ad | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Wed Oct 28 16:46:25 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 28 16:46:25 2015 +0000 |
| tree | 548e985f00161e348e05185f9310883d74963dc6 | |
| parent | 15a90d242afb2b8b594a7d9e6deeffa658872185 [diff] | |
| parent | 8741addbcd88ac508acafcc97c43432227e02171 [diff] |
Merge "A native method may be running and have the resolution stub." am: 8fa2ae3900 am: 098aed8d7b am: 8741addbcd * commit '8741addbcd88ac508acafcc97c43432227e02171': A native method may be running and have the resolution stub.