tree 64bc33c06145797c8ef37945a1c11d0e2566e79b
parent 963685ed5345b0a423bf18228c3cec12e5f754b3
parent be281d0b566d1a4e768505a43699db4f44543838
author Elliott Hughes <enh@google.com> 1513623610 +0000
committer android-build-merger <android-build-merger@google.com> 1513623610 +0000

Merge "Increased number of Android log lines for tombstones" am: 3e58777255
am: be281d0b56

Change-Id: I8c05ac24d7cc3cf6e5a0403716456b9da5219060