tree 817fcfed795a512fa8c98e12cea08d1c7d9ac924
parent b499acecb203a06a0783e5f119a06da125e2a37b
parent b81173f3dc6e52366101deeb420d1b89e0b093d5
author Daniel Xie <dxie@google.com> 1456350315 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1456350315 +0000

Merge "Revert "DO NOT MERGE ANYWHERE: bump version to 201604s"" into lollipop-mr1-cts-dev