commit | 5127718e29948f3c8f88bbde1c5f360c319f3053 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu May 09 17:23:46 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu May 09 17:23:46 2019 -0700 |
tree | 513f39acbf2acce020bb6ab8438b580e946ebd3f | |
parent | cbcfbf4fc7b6492812feca8ebd4a88f240cd88cc [diff] | |
parent | 46be1c3695d81674f274d0a562bd0afb6e9bc644 [diff] |
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 4d336a4ea4 -s ours am: 46be1c3695 -s ours am skip reason: subject contains skip directive Change-Id: Ic815c59e4dc46d59bde981c618fe4c5434c5d371