| commit | efcad091933a1a094d94a9e60c56ba26e13cce01 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed May 06 23:36:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 06 23:36:15 2015 +0000 |
| tree | 24a43819ac118719569f852fb6be2b4b7e54da39 | |
| parent | 2082a9c525bd42391e7fd90432380f5ad7a0b064 [diff] | |
| parent | 349251a69ac1dd1fa47e0d1e213b57a8bf326722 [diff] |
am 349251a6: (-s ours) am a44362bc: am 126460b4: am bbb17724: am 89c8f21c: Merge "DO NOT MERGE - Fixed the order of parameters passing" into lmp-sprout-dev * commit '349251a69ac1dd1fa47e0d1e213b57a8bf326722': DO NOT MERGE - Fixed the order of parameters passing