tree 346e826932eef1b4402dfa98796075e63d3c90e8
parent 134d67be4dc6f245ad0c8ee30f9d43a0e1a52ff6
parent 81bac09fa6b01dd1495644d9c825c3666762fced
author Mathias Agopian <mathias@google.com> 1279158174 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1279158174 -0700

Merge "move native services under services/" into gingerbread