tree 4453cfbdab1a996658cd1a815711664ee7742380
parent 9458f8e38d4fe0d58890c5867485dbbf2d538955
parent 02d71e78adfa0858889a2f0b84adb98dbe3e6fa0
author Nan Zhang <nanzhang@google.com> 1504296593 +0000
committer android-build-merger <android-build-merger@google.com> 1504296593 +0000

Merge tag 'v3.6.1' am: 600f716d51
am: 02d71e78ad

Change-Id: I80f10414953e34a5bbcf6fa4aeda7cf38177e919