| commit | fb1084a5f5c144ce274b1ccb7c11d7a7fbdb206e | [log] [tgz] |
|---|---|---|
| author | Wyatt Riley <wyattriley@google.com> | Mon Mar 27 16:36:24 2017 -0700 |
| committer | Wyatt Riley <wyattriley@google.com> | Mon Mar 27 23:57:35 2017 +0000 |
| tree | 23fddd3592a0e5f0543bcdfd55d5e254a85aac80 | |
| parent | af0fb41585b59647e1a2670f6dcd005a470a9d81 [diff] |
DO NOT MERGE: Restore UiThread annotation Correcting merge error in https://android-review.googlesource.com/#/c/354160/ Bug:36477352 Change-Id: I2c1ce161cd8c1d348869782f078417cadd8e59e1