tree 9595bce217d0ee15d1d89f4d3059a5f2094a0318
parent 46f2249f468ce5b743d9c44423ea50b530db04cf
parent 3c03d5bd2b4b7fa645ee48e6b8ddbcce7f3b6193
author Hans Boehm <hboehm@google.com> 1506424339 +0000
committer android-build-merger <android-build-merger@google.com> 1506424339 +0000

Merge "Naming fix and add comments"
am: 3c03d5bd2b

Change-Id: Ib35c874f56f87757904553ceeffb4d363eff196e