| commit | 7c6046833370c6a1d1408a86d81cfad7ae7db808 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Tue Mar 17 00:24:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 17 00:24:34 2015 +0000 |
| tree | 6733e0eed3032bee1e9d752fed2e02899db82d0c | |
| parent | fce429d4f0dd3dbadd59bcc9eb4a7f10da6c67cc [diff] | |
| parent | 27959c30394f629e0c551e1c8dacaad8b42817a5 [diff] |
am 27959c30: (-s ours) am ef30a2a8: (-s ours) [DO NOT MERGE] Fixing build error in launcher_protoutil_lib * commit '27959c30394f629e0c551e1c8dacaad8b42817a5': [DO NOT MERGE] Fixing build error in launcher_protoutil_lib