| commit | a6e0addc26a8248e986657e49e88a0e55d2163bb | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Tue Jun 06 17:00:17 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 06 17:00:17 2017 +0000 |
| tree | b28f69aea51f8c868434d3bd3c906330336be842 | |
| parent | 28f6dc951223a017f9abc90599662cb3f4995ad1 [diff] | |
| parent | a178d194f9f8790a0bec2588b5990f40389b97a8 [diff] |
Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev am: a9c185f6e7 am: a178d194f9 Change-Id: Iec712211a2c83798ae160560d1cca9ce23b7e577