tree bc9d1ef4d968e9c417d65bb290cf7e2f79eda098
parent c629681f344c490fecc80af11e60ba8ea5e13349
parent 65fdc9585e90d5672fa5e3fb36b511b2f5e1f0b0
author Xavier Ducrohet <xav@android.com> 1366166513 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1366166513 +0000

Merge "Fix some deprecated usage."