tree 4453cfbdab1a996658cd1a815711664ee7742380
parent 9458f8e38d4fe0d58890c5867485dbbf2d538955
parent 600f716d51b9501373f63e6081917289830754f2
author Nan Zhang <nanzhang@google.com> 1504296274 +0000
committer android-build-merger <android-build-merger@google.com> 1504296274 +0000

Merge tag 'v3.6.1'
am: 600f716d51

Change-Id: I72db06fd0f4d5fe57d2996b31c91c15d6ad22cf6