commit | e7105c397bef9528123de25129d5406a20f1b900 | [log] [tgz] |
---|---|---|
author | Makoto Onuki <omakoto@google.com> | Tue Jun 23 21:47:21 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 23 21:47:21 2020 +0000 |
tree | 28a01d1c0e380dc1cae05ab9391a372fc154604c | |
parent | ad4b60130d8092b45328edf42b7463ddc4557215 [diff] | |
parent | 0ad81868dad3d9c91569cd99e8da7fe47a6e3d6e [diff] |
Merge "Don't add API annotations in the internal R.java" am: 0ad81868da Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1347423 Change-Id: I87b2c79a4ace04e4b24273b26ec557aa276d7c40