diff options
author | Ulas Kirazci <ulas@google.com> | 2013-07-23 12:04:39 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-23 12:04:39 -0700 |
commit | 09400156818ec809cfc37a950d8b599b52cef88f (patch) | |
tree | 3b74a598085c68dec90b1b54610df86db0cba023 /Android.mk | |
parent | 521d472b7f3efc75118b301131495248d56e3196 (diff) | |
parent | 49e4bdc1eb0a66ea2c5cf370564d746bb9b8053e (diff) | |
download | protobuf-09400156818ec809cfc37a950d8b599b52cef88f.tar.gz protobuf-09400156818ec809cfc37a950d8b599b52cef88f.tar.bz2 protobuf-09400156818ec809cfc37a950d8b599b52cef88f.zip |
am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano."
* commit '19c4090eddf0eb4d65d1b41f283368c5e0f615a1':
Allow NaN/+inf/-inf defaults in micro/nano.
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions