| commit | 3c937a37d555e416cb42be7dd2dbce4611d6558e | [log] [tgz] |
|---|---|---|
| author | Fred Shih <ffred@google.com> | Thu Jul 17 21:04:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 17 21:04:09 2014 +0000 |
| tree | 5d48772e203ce4d06f6da77864dab7b3adc2e4cc | |
| parent | 5283fe36a586df09f86fe47f626870adbb905f8c [diff] | |
| parent | 378866f7e7f26eba1f9b877418ebded41e6d8d41 [diff] |
am 378866f7: resolved conflicts for merge of d8561422 to lmp-dev-plus-aosp * commit '378866f7e7f26eba1f9b877418ebded41e6d8d41': Revert "Revert "Revert "Revert "Add intrinsic for Reference.get()""""