| commit | 4820d8736615f2280bf6d02b3576352e0afa7b87 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:10:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:10:23 2015 +0000 |
| tree | cc23bb4af49f34d3df07d554d286b4c146912a90 | |
| parent | 5bd93aed9027216fad446ae1c5ed0e956477a4dc [diff] | |
| parent | 0cfa0932711ce911c618914fa67dd10eaa6dbc8f [diff] |
am 0cfa0932: am 8d5bd4c0: resolved conflicts for 15c7e068 to lmp-mr1-dev * commit '0cfa0932711ce911c618914fa67dd10eaa6dbc8f':