tree a5963c2b4371a5fb3f1dbbc87730c7a5e4c92d46
parent bc77821e7d522531b7dfd6c10b1df99c94742d9c
parent de062e478c37e98ac61540c9e68af717d95ca9cf
author Jeff Sharkey <jsharkey@google.com> 1622664674 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1622664674 +0000

Merge changes from topic "may27-sdk" into sc-dev

* changes:
  Finalize resource IDs; script to help in future.
  platform/frameworks/base/ - S is now 31