| commit | 3b436b15b7b9de47b258ebc924aa977e36af46c8 | [log] [tgz] |
|---|---|---|
| author | Svet Ganov <svetoslavganov@google.com> | Fri Apr 14 17:23:00 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 14 17:23:00 2017 +0000 |
| tree | 7480ae318f99f801a93b6e2668a4c16edfc5b1ea | |
| parent | e9cf2eb6ac3cec8ef521cc68ca62de67732f963d [diff] | |
| parent | 37933ae25bb77126dc3539caa85dd603669cbdee [diff] |
Merge "Check for non-null parent before delegating to it am: 3a74243ae4" into oc-dev-plus-aosp am: 37933ae25b Change-Id: I264ce0527b8d4b4cc751487a9c14eda35cf733fe