Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25e7cc86 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

resolve merge conflicts of eae68e4d to nyc-dev-plus-aosp 

The JavaDoc comment was already removed by a commit [1].
  [1]: I2b3f84ba451800830878667ce1abd7a99b4f9fea
       7e29d1b4

Change-Id: Ib6d8005e7991b7f48826cc492e65a3fe75edbd67
parents b7f985fe eae68e4d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment