GitLab

* commit 'f9c1fcc5':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk

The access control changes allow us to just use Nfc.apk with
the regular platform certificate, instead of the custom signed
NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle
and just build it out of packages/apps/Nfc now.

The package name is also reverted from com.android.nfc3 to com.android.nfc

The NFC uid needs to get bumped (25 to 27) to allow the cert change.

Bug: 5608249
Change-Id: I5e178b469e5210cd231ba5f4ea57aa666b3d8893

* commit '2a38657d':
  DO NOT MERGE - disable memory dumps

This disables the hex dumps of memory for registers other than PC
and LR.

Bug 5484924

Change-Id: I26cff857e5d01ed30548ca3e55bdddd63b592c0c

* commit 'b90cb1d2':

* commit 'c6023243':

Change-Id: I9671d18aeee882196d56644533c962942c4fbb70

* commit '25a89e77':
  Fix build

Change-Id: Icbe57024e6018600d47a68132f53f15d7602dc92

* commit '61b90bd2':
  adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats

Normally only bandwidth stats for the uid reading .../stats is returned.
With the extra group, adb shell will be able to read stats from
all UIDs.
This is to be used to offer data usage profiling to developers.

Change-Id: If3d2941ce5aa4dbb1a23947b97b893149ba224f7

* commit 'c761b54e':
  Wimax: wimax related changes for libnetutils

- Modified dhcp renew code for the new conenctivity changes in ICS

Change-Id: I614dfc62a875b79dbd8b7c46f4d87f366a3c3661
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5486930

* commit '3c58933a':
  rootdir: init.rc: write default oom_adj before starting ueventd

* commit '4a253908':
  rootdir: init.rc: write default oom_adj before starting ueventd

Otherwise, ueventd's oom_adj value would have been 0 and it could
easily get killed early during low memory events

Change-Id: I1adbd18c37215b26ae77e70f7b8dbd1e143fc2d4
Signed-off-by: Dima Zavin <dima@android.com>

* commit '6182d031':
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
  Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
  Revert "Merge "Remove log spam" into ics-mr0"

Change-Id: If9c35eae1d56a9fc9017c0ae6626466579a4ac96

This reverts commit 4f7c0843, reversing
changes made to 6fb3df8d.

This reverts commit 6fb3df8d, reversing
changes made to d4f29767.

This reverts commit d4f29767, reversing
changes made to 604f52e3.

* commit '0e4d9eb8':
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
  Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
  Revert "Merge "Remove log spam" into ics-mr0"
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"

Change-Id: Ibfe7c2c1d309f7caae0be71ae631b69830f4e624

This reverts commit 4f7c0843, reversing
changes made to 6fb3df8d.

This reverts commit 6fb3df8d, reversing
changes made to d4f29767.

This reverts commit d4f29767, reversing
changes made to 604f52e3.

This reverts commit 4f7c0843, reversing
changes made to 6fb3df8d.

* commit 'e7184667':
  libnl_2: Fix memory leaks

* commit '4f7c0843':
  libnl_2: Fix memory leaks

BUG: b/5532633

Change-Id: I271168764e26dc465d2442f5015338a3e9a479b8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

am 3e3d0780: am 6fb3df8d: Merge "charger: make the almost-full frame only show when it\'s current level" into ics-mr0

* commit '3e3d0780':
  charger: make the almost-full frame only show when it's current level

am 6fb3df8d: Merge "charger: make the almost-full frame only show when it\'s current level" into ics-mr0

* commit '6fb3df8d':
  charger: make the almost-full frame only show when it's current level

* commit 'a7997f4a':
  Remove log spam