| commit | d1cbbb3d9ebbb1bfc1d890a36bd4f53608dde221 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon May 07 13:49:50 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 07 13:49:50 2018 -0700 |
| tree | c6c87281a9ebda109fd6548049c29a54ed226b3b | |
| parent | b984ec0b71eb3a7e4003370f762abf1786d44b8d [diff] | |
| parent | fdd1af4b2a704a3d0237aaf029c890923698292a [diff] |
[automerger skipped] Merge "Migrate TeleService to aapt2." am: 0080349d29 am: a3d478574e -s ours am: fdd1af4b2a -s ours Change-Id: I15094fd814ecc9144074d446cd028e5a9b0c9c7b