tree 33b5493420aff69d2056c48d366cfa705fdd9258
parent a2510c63649c528dd98663ca265825f7e9b1f593
parent 67762b83bec04123ce89b93d74052e5e3277350c
author Yi Kong <yikong@google.com> 1515445050 +0000
committer android-build-merger <android-build-merger@google.com> 1515445050 +0000

Merge "Fix unused variable warning" am: 6f7f629de8
am: 67762b83be

Change-Id: I25c942e67e61d1f9a50cd3849331f7a50f6910bd