tree 054159015c276496a03963aae51f2c08270752ca
parent 25b0a46ada0f8a5a1c3b3dad109ff2b0b3bb12f4
author cgdecker <cgdecker@google.com> 1429649595 -0700
committer Sam Berlin <sameb@google.com> 1429817143 -0400

Also fix usages of a couple of @Beta APIs.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=91720693