| commit | 5ed23fd161faa664e694507e6af4a1bd966e3d23 | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Tue Nov 04 19:11:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 19:11:12 2014 +0000 |
| tree | cc3e1959e92f68cabb4c25fa6ab991750e8287ae | |
| parent | 6e1b256c0bc5e1c547c2dc4d6a812d601689c44c [diff] | |
| parent | 9c17ea89db4f9a1a352f41642d49596042448574 [diff] |
am 9c17ea89: Merge "Merge commit \'e1cdad86\' into lmp-mr1-dev (-s ours)" into lmp-mr1-dev * commit '9c17ea89db4f9a1a352f41642d49596042448574':