| commit | 721b91584572ed490e7c2157274498e194c4f345 | [log] [tgz] |
|---|---|---|
| author | Lalit Kansara <lkansara@codeaurora.org> | Tue Dec 06 13:48:26 2016 +0530 |
| committer | Lalit Kansara <lkansara@codeaurora.org> | Tue Dec 06 13:48:26 2016 +0530 |
| tree | bbcd9ec6f7059e49bb2aac968c394a6b0900c209 | |
| parent | d99a543e6205bce8380bf7d67d22ed9557fc22f7 [diff] | |
| parent | 12eb0c532e33ca5d5e98addd580b5ad0a4b71be4 [diff] |
Merge commit '12eb0c532e33ca5d5e98addd580b5ad0a4b71be4' into remote Conflicts: test/Android.libarttest.mk Change-Id: I3fcda1291361412d09c2732e54d62e95c0b1fc4b