commit | d7ddad5dc7f529d64b35188bfc4a32c0e3f3d42e | [log] [tgz] |
---|---|---|
author | Makoto Onuki <omakoto@google.com> | Tue May 17 18:18:20 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue May 17 18:18:20 2016 +0000 |
tree | 4be5b1def35462fffa85294e55c76cdb97d1763f | |
parent | 2d52390ac96678986288183d7f5ae7a18cee2131 [diff] | |
parent | b6fc18aa28e087806b3f83bb770d0f8eac37ff72 [diff] |
Merge "ShortcutDemo: changes for DR API update." into nyc-mr1-dev am: b6fc18aa28 * commit 'b6fc18aa28e087806b3f83bb770d0f8eac37ff72': ShortcutDemo: changes for DR API update. Change-Id: Iddc9c0a315acf7220d90f80f77aa22b944e2ae48