| commit | 75f97d8a5a82f00ab8e2f68b3615a6f1d07d8368 | [log] [tgz] |
|---|---|---|
| author | Miao Wang <miaowang@google.com> | Wed Mar 30 00:52:12 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Mar 30 00:52:12 2016 +0000 |
| tree | 2ae694a3e164ff880791334a023445fc02834d5b | |
| parent | e9a6e6747c0ecbb560569750e65efb5fd6191998 [diff] | |
| parent | 1c0614820f3fab564a7b35fcace809894ce50a2d [diff] |
Merge changes I596e00fa,I89fda42d into nyc-dev am: 44f546a * commit '44f546aa68231f466e629e53240030f9cefc3e84': [RenderScript] Fix IntrinsicConvolve documentation. [RenderScript] Update the documentation of Script.LaunchOptions Change-Id: Ib2ffa5a97d5bbc8264f3442d20aecf3ddec65ef1