Merge branch '5-api-138-1' into 'master'
authorPyry Haulos <phaulos@google.com>
Thu, 23 Jul 2015 14:20:45 +0000 (10:20 -0400)
committerPyry Haulos <phaulos@google.com>
Thu, 23 Jul 2015 14:20:45 +0000 (10:20 -0400)
Update API to 138.1

See merge request !16


Trivial merge