diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-08-10 01:42:19 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-08-10 01:42:19 -0700 |
| commit | 82583bfef13e4ac6fb2a373992ce451717091552 (patch) | |
| tree | 9c5750b0940de5798405d6be24a35253ca8e6363 /init/init.c | |
| parent | f773f0589761fba76ed4fb77345fb24efbce9828 (diff) | |
| parent | b8d3d0e905b82d3fee42d955968c4f57c1776086 (diff) | |
| download | system_core-82583bfef13e4ac6fb2a373992ce451717091552.tar.gz system_core-82583bfef13e4ac6fb2a373992ce451717091552.tar.bz2 system_core-82583bfef13e4ac6fb2a373992ce451717091552.zip | |
Merge branch 'jb-release' of https://android.googlesource.com/platform/system/core into aosp
Conflicts:
rootdir/init.rc
Change-Id: I62663d9afbce06c44d2ace254e73ee1594632967
Diffstat (limited to 'init/init.c')
0 files changed, 0 insertions, 0 deletions