commit | 168176566991c012441b23a81c6e5940be3b01c4 | [log] [tgz] |
---|---|---|
author | Sanket Padawe <sanketpadawe@google.com> | Tue Apr 04 17:56:33 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 04 17:56:38 2017 +0000 |
tree | 6cbd2467bbceb22f54b4ecba29e9d39d2f041804 | |
parent | 8b0979666af3426fd1c6d75c1ac7ad1d3440fc38 [diff] | |
parent | edf3bae41e150ae78bab825deca3c007997aa156 [diff] |
Merge "Merge commit 'b73a3bd336edc8fa22ba61fb24a17036cbefce76' into manual_merge_b73a3bd336ed" into oc-dev-plus-aosp