OSDN Git Service

am f40f46e9: am 7f92f067: Merge "Allow 3P apps to provide structured data within...
authorChirag Shah <chirags@google.com>
Tue, 16 Jun 2015 21:24:48 +0000 (21:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Jun 2015 21:24:48 +0000 (21:24 +0000)
commit3db44d08ea8fb083ec952ff647b6037bb9b2253d
tree3e1eb3c9d7f163aabb69e6ea7cf2b18a89a3f06a
parent225a049d7a95f9584a97d99c758a385ec50d41b5
parentf40f46e94c773676158b3f7e9cd51157cc9a91d2
am f40f46e9: am 7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev

* commit 'f40f46e94c773676158b3f7e9cd51157cc9a91d2':
  Allow 3P apps to provide structured data within AssistContent.