commit | d50050392d9f99fda0ee22edcdddde61da79ba86 | [log] [tgz] |
---|---|---|
author | Yohann Roussel <yroussel@google.com> | Mon May 23 16:33:36 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon May 23 16:33:36 2016 +0000 |
tree | 5e27765d494c3c477b0a646190280d9b6e07fd52 | |
parent | 0f32fe7f2d475b37a6ccd2647640a178f1c14283 [diff] | |
parent | f38157053e5f40a4f76d550de3b5d2e104c5847b [diff] |
Merge "Import Jack and Jill Douarn 1.3-pa4" am: e18f034a31 am: f38157053e * commit 'f38157053e5f40a4f76d550de3b5d2e104c5847b': Import Jack and Jill Douarn 1.3-pa4 Change-Id: Icf28657a37acd737d8529badb29a169d6bf087df