| commit | c3425d996a02d4225fac0b703ba442cab9d802ca | [log] [tgz] |
|---|---|---|
| author | Scott Lobdell <slobdell@google.com> | Tue Jan 22 18:03:12 2019 -0800 |
| committer | Scott Lobdell <slobdell@google.com> | Wed Jan 23 14:21:18 2019 -0800 |
| tree | d852b0cff91e46218012aeaee0872de2b07c9721 | |
| parent | d39eac7b4125de9b932ad35d30ce50d401b07d77 [diff] | |
| parent | a24f412fba731416050af1273532905e1037a391 [diff] |
Merge QP1A.190122.001 Conflicts: res/values/strings.xml Change-Id: I4293ca999625f2b5d5872b024ad271a97d4d9d1d