diff options
| author | Nick Kralevich <nnk@google.com> | 2015-08-27 05:11:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 05:11:50 +0000 |
| commit | e6fc3d2b47565a0911211dd9eb0b02d0ddfe32c9 (patch) | |
| tree | 500317ec0cc6cbab5d35cd24399b0d26f3ab9c1e | |
| parent | 70ac2571a83ef9efccfa7ab0ef9c41bb0289a0f2 (diff) | |
| parent | 2a4e4c485027b537b78a90a81712e4377ebb8113 (diff) | |
| download | fugu-e6fc3d2b47565a0911211dd9eb0b02d0ddfe32c9.tar.gz | |
am 2a4e4c48: (-s ours) resolved conflicts for merge of 1ed1f7c1 to mnc-dev-plus-aosp
* commit '2a4e4c485027b537b78a90a81712e4377ebb8113':
0 files changed, 0 insertions, 0 deletions