OSDN Git Service

am 81b32966: am 056cf62b: Merge "Update code so it compiles on google3" into ub-now...
authorSameer Padala <sxp@google.com>
Sat, 31 Jan 2015 01:07:30 +0000 (01:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 31 Jan 2015 01:07:30 +0000 (01:07 +0000)
* commit '81b32966205e242f9470137caf829aaa8c45e19d':


Trivial merge