tree b35d11c8e4b8d7eb55dfddd3a8263952b8a65f70
parent dbffc46d3cfa71f01a454f8aa40e3b4005c992a9
parent e7741e1328c3e4df86ecf544ba608fd33bae97be
author Nick Korostelev <nkorsote@google.com> 1418341629 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1418341630 +0000

Merge "Cleaned up usages of deprecated APIs"