aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorJeff Davidson <jpd@google.com>2015-02-19 20:54:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-19 20:54:04 +0000
commitf0553c937cfe71f25027b6be9bb63554fbdd8b0b (patch)
tree3514c43bbe2d019c240f56a37b2f9404c7b6da8c /android
parentaaa31cd17868b9cba27d70e33d008e72ba9f9c8b (diff)
parent0816d189919016880f36262e36b3a11407ead2b1 (diff)
downloadexternal_protobuf-f0553c937cfe71f25027b6be9bb63554fbdd8b0b.zip
external_protobuf-f0553c937cfe71f25027b6be9bb63554fbdd8b0b.tar.gz
external_protobuf-f0553c937cfe71f25027b6be9bb63554fbdd8b0b.tar.bz2
am 0816d189: am 72b0f4cf: Merge "Generate @IntDef annotations for nanoproto enums."
* commit '0816d189919016880f36262e36b3a11407ead2b1': Generate @IntDef annotations for nanoproto enums.
Diffstat (limited to 'android')
0 files changed, 0 insertions, 0 deletions