tag d20ebca2709491837916771d24b482c86715fdb7
tagger The Android Open Source Project <initial-contribution@android.com> Fri May 29 16:32:52 2015 -0700
object 07228a3e52048d81aac4b84f3d125e2527aafafa

Android m-preview Release 0.8

commit 07228a3e52048d81aac4b84f3d125e2527aafafa
author Patrick Tjin <pattjin@google.com> Mon May 04 08:16:33 2015 -0700
committer Patrick Tjin <pattjin@google.com> Mon May 04 08:23:35 2015 -0700
tree 2f9f1c11b11adffdd8a994b3710cf1e9d4d52ebc
parent 9058c31917bf0982d0313e870abc85891d993b36
parent eaa478ab44cd84a788dee5f77ef3171ce83d04cf

Merge remote-tracking branch 'common/android-3.10' into android-x86_64-fugu-3.10

86aa048 proc: uid_cputime: create uids from kuids
6902d1f subsystem: CPU FREQUENCY DRIVERS- Set cpu_load calculation on current frequency
98a4d82 SELinux: use deletion-safe iterator to free list
1f9ac0f android: configs: Enable SELinux and its dependencies.
1bc0c246 nf: IDLETIMER: Adds the uid field in the msg
8cdfb35 SELinux: ss: Fix policy write for ioctl operations
8aa01b2 usb: gadget: add audio dependencies to USB_G_ANDROID
d71efce android: base-cfg: add ALSA
eaa478ab4 ipv4: Missing sk_nulls_node_init() in ping_unhash().

 Conflicts:
	drivers/cpufreq/cpufreq_interactive.c

Signed-off-by: Patrick Tjin <pattjin@google.com>