| commit | 98e68cc94d6b814d572bbe37bdb1a62ef6ca4769 | [log] [tgz] |
|---|---|---|
| author | Benoit Lamarche <benoitlamarche@google.com> | Fri May 20 14:32:07 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 20 14:32:07 2016 +0000 |
| tree | 1743b22a301e4ef42b1ffdc8ff70ff5ecad11c55 | |
| parent | 74e3b9e346168730727124b33913f8a1949fea1a [diff] | |
| parent | 93453502ea2cea16322b96ef5aa1e33ef81fbced [diff] |
Merge "Import Jack and Jill Carnac 1.2-rc4" am: 7d12afa6f6 am: 93453502ea * commit '93453502ea2cea16322b96ef5aa1e33ef81fbced': Import Jack and Jill Carnac 1.2-rc4 Change-Id: I6b141236c2c852efc2d3a2d306c041eabbbd3942