OSDN Git Service

Merge "ShortcutManager: First cut of CTS" into nyc-dev
authorMakoto Onuki <omakoto@google.com>
Mon, 11 Apr 2016 23:25:23 +0000 (23:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Apr 2016 23:25:23 +0000 (23:25 +0000)
commit0beb56d4e49f433759f7c825374c90442f2aed53
tree72249fd17ea37525c304c5f59c294017c37b801a
parent55134c89fe5a524be26558b4ccccdfa6ffa0105f
parentbc20320f7f224d1cc5be3c436a1a5ece2067f2ec
Merge "ShortcutManager: First cut of CTS" into nyc-dev
am: bc20320

* commit 'bc20320f7f224d1cc5be3c436a1a5ece2067f2ec':
  ShortcutManager: First cut of CTS

Change-Id: I23d24480870644cf69575d2f11bfc55056c0fb96