| commit | e58a49e411327e26b6ad9939833f53c7fa5aef20 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Fri Dec 20 16:36:48 2013 -0800 |
| committer | Amith Yamasani <yamasani@google.com> | Fri Dec 20 16:36:48 2013 -0800 |
| tree | a983bb17f76bcccef7cd94830525e7e7d02ce314 | |
| parent | 3c8a529b3c2a0bb1eceb3c1ec7afa58634ace044 [diff] | |
| parent | 817ec49e7991d4cac50b2308cd7cf5f8641e1e29 [diff] |
Merge commit '817ec49e' into manualmerge Conflicts: services/print/java/com/android/server/print/PrintManagerService.java Change-Id: I1b9bf364ca50ee3c48f53d87ae0ce23e7f3c2bc2