commit | 00f257d39937349c1be285982cc0030d90deb1ec | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Mon Jul 23 20:51:15 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jul 23 20:51:15 2018 -0700 |
tree | 13419c65a0a53002eedde0bf4389c1b19142b5f1 | |
parent | 3f782c2762b7ba13f137a2f47f6f2b056a1cdae8 [diff] | |
parent | 2d2aa6fa2835346ee8d580cd41decadbdbad1b6b [diff] |
[automerger skipped] Merge "PhoneInterfaceManager: Simplify WorkSource derivation." am: 081a469002 -s ours am: e5efde646c -s ours am: 2d2aa6fa28 -s ours Change-Id: Ia14a9c4f543dae68bde5b903b530b7971be6c5fe