| commit | 3fb651b0b73c462d96df063e19cc3cfefa249262 | [log] [tgz] |
|---|---|---|
| author | Chih-hung Hsieh <chh@google.com> | Fri Jul 22 01:53:29 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 22 01:53:29 2016 +0000 |
| tree | 1410dcb07572f691134aea7792016f5e74b663b4 | |
| parent | cc94c31e15ce26914729c2b72cd2806ed54e5eb7 [diff] | |
| parent | 05160d70d14180fef3782a63dff2e822b51c3cf5 [diff] |
resolve merge conflicts of 5152fd9 to stage-aosp-master am: 05160d70d1 Change-Id: Id1d734fd162d6063fdc818afc68f09809f764c5f