tree 4453cfbdab1a996658cd1a815711664ee7742380
parent 9458f8e38d4fe0d58890c5867485dbbf2d538955
parent 341ad5d6d1a5720d329abd5e59150cd3dd52b5f0
author Nan Zhang <nanzhang@google.com> 1504296821 +0000
committer android-build-merger <android-build-merger@google.com> 1504296821 +0000

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

Change-Id: I3f66d78f484995d420f351db27842c745f895fe1