| commit | 03d94106a8acf371f669f611e296af338943f78d | [log] [tgz] |
|---|---|---|
| author | Anh Nguyen <anguyen@codeaurora.org> | Mon Mar 09 23:39:19 2015 -0700 |
| committer | Anh Nguyen <anguyen@codeaurora.org> | Mon Mar 09 23:39:19 2015 -0700 |
| tree | 8369f4dcde5741cb5dd471c44275ba93d4b6e2f0 | |
| parent | 3952611fe19e3289f6502f52736ad28a1cad0863 [diff] | |
| parent | eb255708970f4723afa45ebc842de25ac9488235 [diff] |
Merge tag 'android-5.1.0_r1' into HEAD Android 5.1.0 release 1 Conflicts: fs_mgr/fs_mgr.c healthd/healthd_mode_charger.cpp include/system/audio.h rootdir/init.environ.rc.in Change-Id: I7a11f9aaf2f73854a724392625b0c2719fb2a829