commit | 66e566bc17f55065aaacc06433ff06ca752939d7 | [log] [tgz] |
---|---|---|
author | Alexey Polyudov <apolyudov@google.com> | Wed Nov 01 16:17:45 2017 -0700 |
committer | Alexey Polyudov <apolyudov@google.com> | Wed Nov 01 16:17:45 2017 -0700 |
tree | c8677c5abc5642e00969fc0bc4157f5a786e337b | |
parent | a64033758e94b81200eaab04e3ebd696ba51aaaa [diff] | |
parent | 228f24c988048603468b396a24ea5bbf0f264620 [diff] |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.6.3.R1.00355.2' Conflicts: libbt-vendor/Android.mk Change-Id: Iaaa9bf7883dc2b16ca5e1fedd944ddac3d7f85cd